Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

🌱 Update to Kubernetes v1.29.2 #2707

Merged
merged 1 commit into from
Mar 15, 2024
Merged

🌱 Update to Kubernetes v1.29.2 #2707

merged 1 commit into from
Mar 15, 2024

Conversation

vincepri
Copy link
Member

No description provided.

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Mar 15, 2024
@k8s-ci-robot k8s-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Mar 15, 2024
@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 15, 2024
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: alvaroaleman, vincepri

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:
  • OWNERS [alvaroaleman,vincepri]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@alvaroaleman alvaroaleman changed the title 🌱 Update to Kuberentes v1.29.2 🌱 Update to Kubernetes v1.29.2 Mar 15, 2024
@vincepri
Copy link
Member Author

/retest

@vincepri
Update to Kuberentes v1.29.2
87bcfec 
Signed-off-by: Vince Prignano <vincepri@redhat.com>
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 15, 2024
@vincepri
Copy link
Member Author

/retest

@sbueringer
Copy link
Member

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 15, 2024
@k8s-ci-robot k8s-ci-robot merged commit 05127e5 into kubernetes-sigs:main Mar 15, 2024
9 checks passed
@sbueringer
Copy link
Member

/cherry-pick release-0.17

@k8s-infra-cherrypick-robot
Copy link

@sbueringer: #2707 failed to apply on top of branch "release-0.17":

Applying: Update to Kuberentes v1.29.2
Using index info to reconstruct a base tree...
M	examples/scratch-env/go.mod
M	examples/scratch-env/go.sum
M	go.mod
M	go.sum
Falling back to patching base and 3-way merge...
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
Auto-merging examples/scratch-env/go.sum
CONFLICT (content): Merge conflict in examples/scratch-env/go.sum
Auto-merging examples/scratch-env/go.mod
CONFLICT (content): Merge conflict in examples/scratch-env/go.mod
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Update to Kuberentes v1.29.2
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-0.17

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@sbueringer sbueringer mentioned this pull request Mar 17, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@alvaroaleman alvaroaleman alvaroaleman approved these changes

@inteon inteon Awaiting requested review from inteon

@joelanford joelanford Awaiting requested review from joelanford

Assignees

@sbueringer sbueringer

@alvaroaleman alvaroaleman

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@vincepri @k8s-ci-robot @sbueringer @k8s-infra-cherrypick-robot @alvaroaleman